merge from trunk
authorKenichi Handa <handa@m17n.org>
Tue, 5 Jan 2010 11:42:19 +0000 (20:42 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 5 Jan 2010 11:42:19 +0000 (20:42 +0900)

Trivial merge